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

Change-Id: I75f2b8ad86b86d70715ff18f198a699c942e15a7