Merge "Backporting of b/77821568" into oc-dev