Merge cherrypicks of ['googleplex-android-review.googlesource.com/22681705'] into tm-qpr3-release.

Change-Id: Id7b60ae5fa44db3840bead564ddd8552fa5a3487
tree: b86a08318f8340b46ee4f083be6d0ba6762b3a57
  1. .prebuilt_info/
  2. current/