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

Original change: undetermined

Change-Id: Ic6ea6bbf76c77aa8fc369b6e7f6c92b553b4306a