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

Change-Id: I59f203d69b5328439419ab133de350e95104b591
tree: 1b09e3e6ca641525422f222143ab5a7f62f118b1
  1. .prebuilt_info/
  2. current/