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

Change-Id: I22f8ea0379196bce2a5f71e6cc8c438289f5624e
tree: de98fd0d92e4f4eab520d9f10049939b178aac5f
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS