[automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633 am: f3f6e2f9ee am: 1b67b798cf -s ours am: 1028b26d46 -s ours
am: b88cac5977 -s ours
Change-Id: I0d8cecbe603a931fa874de932da94fc566bba728
This commit is contained in: