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

COASTGUARD_SKIP: I7f334db130c2abca77742b047e972b46482b9a88
COASTGUARD_SKIP: I811bb03fdde503317bdf390342701ce6d13908e6

Change-Id: I216b9cb0360a972c49893ec70b6235cf96ca788f
tree: 6e2386f23af93b3ed41cfbcc3246db7601a86023
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS