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

Change-Id: I583e3c8a22de90f3fb0d42d547271cca6dd70633