[coastguard skipped] Merge sparse cherrypicks from sparse-13207705-L81300030010383345 into 25D4-release.
COASTGUARD_SKIP: I993d16cbad7d612fafe45f8771b46acb356942f7 COASTGUARD_SKIP: I74dde1b649d544f601c62c81e52b98dff2b7ed2d Change-Id: I23d087e93d811b682bb58131c3e65e3e34591446
This commit is contained in:
commit
005b2b42ee