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

Change-Id: I8427e505f99fdf4ca77220132aabae39fb629557
tree: c10c924fa7343cd77599d1c0f25de06c56561881
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS