Merge changes from topic "mar31" into rvc-dev am: 7278faccef am: bf68a16d01 am: 40ae3b1b72 am: e80979d32a

Change-Id: Ie0e66b24a41a961c44b0a46ab305a7a516e81119