Merge cherrypicks of ['googleplex-android-review.googlesource.com/32728779'] into 25D4-release.

Change-Id: I44595e4f7bc19239cfad1be6e22b911d29f45217
tree: 02e476ff21124275fe2276aa7d1b6052509323b9
  1. .prebuilt_info/
  2. 13/
  3. current/
  4. METADATA