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

Change-Id: I8af1c17506ac4c672a33cabaf3be226c57806c6c
tree: 1e4fccb42cefdd660754815d8bb6a1d6dc3cea4b
  1. .prebuilt_info/
  2. 7/
  3. current/
  4. go/