Merge changes I7bb9d561,I2748d4a7 into rvc-dev am: 0df912df57 am: b598786989 am: a862c6d87d am: a92b13841f

Change-Id: Ifd5fd2bc819925bd81245c4ac86df23630b0e296