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

Change-Id: I6b6c3678a23b386474abf272ff86305d46b1299c
tree: bfff8992615cf27bd7906b45019e4ea95d78df34
  1. .prebuilt_info/
  2. 3/
  3. 7/
  4. current/
  5. go/