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

Change-Id: I9159efd12a2e08078909ba1c15cc8c62afa04ce5
tree: c881e3713ed9aa32b36ff3b563bd42177af16295
  1. .prebuilt_info/
  2. 7/
  3. current/