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

Change-Id: Ia74f08f40eaf41d5888a933e1f5a7676e0012095