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

COASTGUARD_SKIP: I64f8577e0767a54b510e0aa64c5386fb9ee0c202
COASTGUARD_SKIP: If937b427bd2de89950efb2d32755e7bfcfa0cdc1

Change-Id: I8413477673294c3d684e9db3b933779cf4bded80
tree: 29a6ffa40ab2801a528dbd9394810473fe44e63a
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS