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

Change-Id: I6081eab8570f42e0156a7805296e2134dcf2827c