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

Change-Id: If7dda29eb8a8babe34065bb19c7c69a029722606