Merge changes I3e8594f6,I2c6d40ee into rvc-dev am: 08327f1659

Change-Id: I51c4a9ba3499e5f8cb72b643c042e5033ed9933b