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

Change-Id: Idf201f915df094449cf245d2eac479861f02470f
tree: 7c5b0c23b9791cf239f50319f0e3aeb95e189f28
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. current/
  6. OWNERS