Merge changes I7c542db9,I6f809ce2 into rvc-dev am: dc1fe78978 am: 858ad5e7d5

Change-Id: I6427621321377208afaeeb2633e5b2c3ffd098a6