tree 45a8999edc2980f4a84706ac66e2a7b98eca3edd
parent 26a58cac01e7049919b873151c2b5ffa981c701a
parent a7a9154f24a4d419c2a36d97eeccd6159e4d84e8
author android-build-team Robot <android-build-team-robot@google.com> 1590005251 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1590005251 +0000

Merge cherrypicks of [11559179, 11556529] into rvc-release

Change-Id: I6e43521080be7f8b4393efe56ac4c29f9edbe859