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

Change-Id: I62e75ae21a6b156802a836c6b6a717c44da1f984