tree ebef75424b394cf77bf65660970e78c2549ede39
parent 1317641317eebee91988e5e338277a31c835eee2
parent 8d792dd63617c50486f383a4dd44635bde1a9fba
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676398865 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1676398865 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20731569'] into tm-qpr2-release.

Change-Id: If6e3d82d98b45cf835fbe9fffb4d8936e148207b