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

Change-Id: Ib7d9848a500aad5a0f11998e28186ab712f67f82
tree: e08f073eb424fc6cd87eef3798ee972354451032
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS