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

Change-Id: I0024228c755a822f450f7d44506d00ecb7b506a0
tree: 81e89b595bcb3161d724c9e581af5f462a2c15cd
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS