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

Change-Id: I8ec30ad23896c4cfb0464f7bedf223db823e8a4a