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

Change-Id: I889bee2a8c7bfd13e887ec48018a88b9c46658d0
tree: c439c87d2444a226376c45526109545d0b107aae
  1. .prebuilt_info/
  2. 3/
  3. 4/
  4. 5/
  5. 6/
  6. 7/
  7. current/