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

Change-Id: I2a0ec963a20f88e0c8b409250faeac4a1cb3dad9