Merge changes I2fcd093e,I24210426 into rvc-dev am: 9113e7be95 am: 04e1783f6d

Change-Id: Iba4272d3a24eefd202a59c402016cb798f7d39eb