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

Change-Id: Ifa86c7db015f03851579fb63bd23c59a0cee8f95
tree: e50685fbbf4db8cb1de6e5e40f86bd9f1960a033
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS