[automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633 am: f3f6e2f9ee
am: 1b67b798cf  -s ours

Change-Id: I1f209b583519e73c0912db7583b34324003a5526