Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607 am: b3b15d1738

Change-Id: Ic61bf453ebea9ba05d6a3d258a145b552a0d71a6