Merge changes I1118f2e2,I6c039b32 into rvc-dev am: d4c8a20d4b am: 2de6d7deda

Change-Id: Ica79d5cf4b48e8ebef9b295a09611c25cec0ed53