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

Change-Id: Ieee68e63532afa8eb6fb68258ed93fe3d8c70e45
tree: 592f8a8d7b1a5eac6900bbf2a312d0c5ae0733f6
  1. .prebuilt_info/
  2. 7/
  3. current/
  4. go/