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

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