Merge changes Idb4f9a92,I8d8a926d,I8e30e87e into rvc-dev am: fc48f7e52a am: 72ac5bdb7a

Change-Id: I3cf8179562b38bdb6585f80e89d410944b9062aa