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

Change-Id: I731687bfa5057274688dd372640b8c463d5ccb7b
tree: 07804a034c8d27b64c025943f83e47dc23c6b218
  1. .prebuilt_info/
  2. 7/
  3. current/
  4. go/