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

Change-Id: Ic09f38273f55aba14f704b917c41ce2d641d4b56
tree: a14733a5f21e62f1c2eec2458b9a74f8000bf18f
  1. .prebuilt_info/
  2. 7/
  3. current/
  4. go/