Merge changes If7ea17d5,If6364fd6 into rvc-dev am: 8275fb7d66 am: a6f2c4f62e

Change-Id: Ifc7a8f395fd6716bbd91ad8e119da9ec8ee3fa61