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

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