Merge "Merge changes Ic0d7b4d2,I3441e630,Ie504e687 into rvc-dev am: 2e5dd7ab32 am: 0fd2d1e936 am: 948a0b1d02" into rvc-qpr-dev-plus-aosp