Merge "Merge changes I8942a2db,Ibcef3f40,I6e765563 into rvc-dev am: 930f1d10bc am: 0e87d5ebc1" into rvc-d1-dev-plus-aosp