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

Change-Id: I67448b330be66804cc000f26e44f58baee7a75f9