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

Change-Id: Ibae6beea2651f525abfdc15f42138568b607693b