[coastguard skipped] Merge sparse cherrypicks from sparse-10204971-L19600000960914226 into tm-qpr3-release.
COASTGUARD_SKIP: I16ff99f8b995cc540688787b9f552a5c2365a87d
COASTGUARD_SKIP: I17d48910cd87583118621a76b81c8023c2dfd39d
Change-Id: Ic7927b2056af46e966008fb21fd86c44e0e7b042
Android Build Coastguard Worker