Merge changes Id3953904,I2ef286d6 into rvc-dev am: 94457298ac am: a3b13ffc42

Change-Id: I533f9cc3c749b1eabc94c93965b49f933970a423