Merge changes I14bb4722,I01f139b3 into rvc-dev am: 07b29771b8 am: 4a4a7bfda9 am: d0b293e10e am: cb5880e3c3

Change-Id: I129f64004ea6ae34febabebb4f39cc0fb72ecc1d