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

Change-Id: Ibb01dd2a4d86dfa5c9d5d5338c0c580fa131fc0e
tree: 67d8060b7e6428a30a06276ce4d6e6375f40a084
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. current/
  6. OWNERS