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

Change-Id: I1dbf35e1c17a7937017611dbbad54872403fd9e3