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

Change-Id: I7ece0a3948857be04b6d14050a40412b8d4be594