Merge "Backporting of b/77821568" into oc-dev am: 9774459633
am: f3f6e2f9ee

Change-Id: I1445ecb89dba24df5e89089fbf0aff308331aea0