Merge changes I4dd906fe,I2ef7f266 into rvc-dev am: b4a3b65d29

Change-Id: Ib3544e19566516382eb5053c5dafee42910718bf