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

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