Merge changes Id3953904,I2ef286d6 into rvc-dev am: 94457298 am: a3b13ffc am: f06fa4d5 am: 22d50fc1 Change-Id: I75e3c0c61db7724e27ae19e6d5545b0c1b57fe29