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

Change-Id: I40d7a2e37c85aaca01a5491dd253cd06db2bccc6
tree: 4de570e8a84eff128ff2a2a8ebb63486c710851c
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. 5/
  6. 7/
  7. current/
  8. OWNERS