Merge changes from topic "mar31" into rvc-dev am: 7278faccef am: 3efb6ef657 am: bf49a428b0 am: 3f0aedd3ce

Change-Id: I99237f8a2ce3821b7808f61b73491d8b1cc340c5