tree 6687b2fa8e1ffdf458dceef645d14e62f491b092
parent 6eb4b1ef6a5fbd8799422809341d56409d28a013
parent b56ecb154e5d3219bbe43eb7eae5cb16862da9eb
author android-build-team Robot <android-build-team-robot@google.com> 1568409818 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1568409818 +0000

Merge cherrypicks of [9390149, 9390052] into rvc-release

Change-Id: I146e15690f15197a6324bee068a4a1f83e677a19