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

Change-Id: I2b2898c481c6c266f5a84419397597b64b7a68c2
tree: 2c4793f55dc4272146d23aa3e87132b34198b8a8
  1. .prebuilt_info/
  2. 7/
  3. current/