Merge changes from topic "am-1331fd28dcf7435894fa61c58ad0d294" into rvc-d1-dev-plus-aosp am: 35f1ca8c am: b776a8c9 Change-Id: I6390c4e1dfbd489db5ada248a32208f7f20859fb