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

Change-Id: I07c072331fd206f602ae71bb8b2401eb83422c5f
tree: f8cd6bc0093da549ea24bccd67439a63e8e3b615
  1. .prebuilt_info/
  2. 3/
  3. current/