Merge cherrypicks of ['googleplex-android-review.googlesource.com/29155776'] into 25D4-release.

Change-Id: Id4fb609b8f5962a7e5da4a5240f8110080b9931e
tree: abef1ec6442d956dcaa545d9bb56232fe017d5c8
  1. .prebuilt_info/
  2. 13/
  3. current/
  4. OWNERS