Merge changes from topic "mar31" into rvc-dev am: 7278faccef am: bf68a16d01

Change-Id: Ibe33117b454359590f7472b8404fb0cb343ce92c