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

Change-Id: Id426884315a9744fd1153c3c624998dc7bcc3151
tree: 6de25331d45a5b965066a110073d20419a497c44
  1. .prebuilt_info/
  2. 7/
  3. current/
  4. go/