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

Change-Id: I47c8d59ad31ae6ef433fd85f97e6549149028fb5
tree: 514b2b769ffedefc3c0be7ff472c14aa361c8aa4
  1. .prebuilt_info/
  2. 3/
  3. current/