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

Change-Id: I49bb7186d4b4152cc25153867895c7a30f77ed13