Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev am: 4605ca9daa

Change-Id: I154229f393c1d32d2f9774423937d25157716dac