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

Change-Id: I4cc7906160e828c339237022a576852bf2ac8cf9