Merge "Merge changes I28153a56,I620224b9 into rvc-dev am: 56ea9e94 am: 349b058b" into rvc-d1-dev-plus-aosp