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

Change-Id: Ie2cfb53ff4486cbe5a15884ae6d4e6a1ee60dc6b
tree: c25fcf575b7242fc67d8f470babb0f784fde316b
  1. .prebuilt_info/
  2. 3/
  3. current/