Merge cherrypicks of ['googleplex-android-review.googlesource.com/25815917', 'googleplex-android-review.googlesource.com/25816115'] into udc-d2-release.

Change-Id: Ia0517ab0cda35fe24eac3672f068f474b65453ad
tree: 06436fd81c143aa56a7065056f4a1c5fa332f7b3
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. 4/
  6. 7/
  7. current/
  8. go/
  9. OWNERS