Merge changes from topic "jun1" into rvc-dev am: 8a0bca43c3 am: 858c59fad5 am: f0a0a90c82

Original change: undetermined

Change-Id: I32732fd6b4fafd0444d01dd1096c28d1e79e70d8