Merge changes Ifb23a73a,If1854a77 into rvc-dev am: 9d3317b8da

Change-Id: Id1e8d4be7f3933608635bd51f9077492656bffed