Merge cherrypicks of ['googleplex-android-review.googlesource.com/24055011'] into udc-release.

Change-Id: I57c3a8152b3e8ae4dc3ec729d8d5c030c7fc46c0
tree: 526cf7bb93cea6dcae749dc45bafb7c3c8e26ae9
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. 7/
  5. current/
  6. OWNERS