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

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