Merge cherrypicks of ['googleplex-android-review.googlesource.com/27729663'] into sparse-11945331-L10500030004449972.
SPARSE_CHANGE: I54ef70ec90aad4d127aaf8a289887bad6fd4e87d

Change-Id: Ib66d1c6942a9c26f18e6e3945382770249165a15
tree: 9001f4c3bcafaf0c39f166d339eeec6704a2b8a0
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. OWNERS