Merge cherrypicks of ['googleplex-android-review.googlesource.com/23771605'] into udc-release.

Change-Id: I7f646924e4427dbbd19dbccd649caa3dd75f6e55
tree: 04b51799167591f287d718e4f76be5da345f3498
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. 7/
  5. current/
  6. OWNERS