Merge "Merge changes Ifb23a73a,If1854a77 into rvc-dev am: 9d3317b8da am: de55480c09" into rvc-d1-dev-plus-aosp am: 96ab330b6d am: 7f0a0840b4

Change-Id: I5f58c46fdd35d1c8b041be74c2c91bf6c521a186