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