Merge changes I95898fa6,I21e4b17e into rvc-dev am: dcc609a1b2

Change-Id: I8778eb4d2312e4d95132294ac84287e1f6720018