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

Change-Id: I37c401c3632fb925baef1d5c2ababceaa02ec695