Merge remote-tracking branch 'goog/master' into merge_refactor

Bug: 70043591
Test: ./gradlew createArchive
Change-Id: Ib01d422dae163820f6793847d590ac8b803f803b