[coastguard skipped] Merge sparse cherrypicks from sparse-9548814-L54500000958448065 into tm-d4-release.

COASTGUARD_SKIP: Ic0a98afa4ecc56ff67d063247757b57f29b77265
COASTGUARD_SKIP: I272f99ffbe9fa4e081dfc72f86b87e6aae66d0d3

Change-Id: Iae0f7a32eb80bb34b02c1204d282c0bb907de120
tree: 47fc00e70f6869a4cb2fb023072c44fd0bd0b9a8
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. current/
  6. OWNERS