Merge changes Ibfb3cf6f,I9a4bd220 into rvc-dev am: f9275345db

Change-Id: I0aa9abbe934dd4763f54c8d4dbbd697620503a57