[coastguard skipped] Merge sparse cherrypicks from sparse-11539328-L23200030002362131 into mainline-art-release.

COASTGUARD_SKIP: I7781615510f25a1a727229aa16931f9992526db3
COASTGUARD_SKIP: I20c79baccad74e37a025ad8fbf3a478acceb63a8
COASTGUARD_SKIP: Iaa6859d792626a0f5b3ce1b92521b380421c52ab

Change-Id: Icf0a9693563639eb2c526390a69f88f981306f08