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

Change-Id: Iedfd36ad1c8069607638e35c50adeb35a5add8cc
tree: f8cd6bc0093da549ea24bccd67439a63e8e3b615
  1. .prebuilt_info/
  2. 3/
  3. current/