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

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