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

Change-Id: I44682f93eb5d654fb33c754d5a9dde69afbbae3e
tree: 226874a463e7b1851d210152a64b28da54c6047d
  1. .prebuilt_info/
  2. 3/
  3. current/