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

Change-Id: Ib96231eae15e01dc18ee7e23fde24a76962524ee
tree: 6635c0ee037cef73af5339c2436a3883f8f19ac2
  1. .prebuilt_info/
  2. 3/
  3. 7/
  4. current/