Merge changes from topic "sf_157096772" into rvc-dev am: b74fe1dc23 am: 3c6363492d

Change-Id: I74de05e9c80db8cbafb305963b67d0820d271df8