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

Change-Id: Id7903b4518a862140738be70b1533e83c06ac08c
tree: 3a460a953e0a97ed83d84fae18c2a74fb73021dc
  1. .prebuilt_info/
  2. 7/
  3. current/