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

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