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

Change-Id: I6200be93065552e0cbb637f6a6f3e58a3a53e33d
tree: 7250fff9eb6d67e3a7c8a2ce0c12fb1a2c67a72a
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS