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

Original change: undetermined

Change-Id: I674ab2cf6b303703c2d972e420f9033133b2bf7a