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

Change-Id: I72948900d9bd0437f8c9e59569105cda2a7958b0