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

Change-Id: I9d0f769311a7020e8b1090c9b485ca49f14d2365