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

Change-Id: Ic1d64ebe714ca176d86d03c022ca56deb6e15215
tree: 06a3856af55cd958004391adb819e9bf6a520ec5
  1. .prebuilt_info/
  2. 13/
  3. 7/
  4. current/