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

Change-Id: I5c4f029405c6737404c2833191697546d9807454
tree: c03a813c282e077d7c7698eb72d1440bc5140045
  1. .prebuilt_info/
  2. 3/
  3. 4/
  4. 5/
  5. 6/
  6. 7/
  7. current/
  8. go/