Merge changes If7ea17d5,If6364fd6 into rvc-dev am: 8275fb7d66 am: a6f2c4f62e am: 37f24da8dd

Change-Id: I2b2215c75200f473efc60a1fd769d69ae1d52b39