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

Change-Id: If89aff43cf12c9e5071195f910db374cbac68f3a