Merge cherrypicks of ['googleplex-android-review.googlesource.com/20908609'] into sparse-9548814-L54500000958448065.
SPARSE_CHANGE: I272f99ffbe9fa4e081dfc72f86b87e6aae66d0d3

Change-Id: Ic0a98afa4ecc56ff67d063247757b57f29b77265
tree: 7c5b0c23b9791cf239f50319f0e3aeb95e189f28
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. current/
  6. OWNERS