Merge cherrypicks of ['googleplex-android-review.googlesource.com/25815580', 'googleplex-android-review.googlesource.com/25815747'] into sparse-11282838-L21100030001153269.
SPARSE_CHANGE: I400d05330e5f132d1dfd775c1028e02d05f36949
SPARSE_CHANGE: I14dfc08a7f7914a9d9ef97d675b6effacf483419

Change-Id: I1ffc3a919c0f77b79ce99748af89dd30f7025955
tree: 9d3d0f498b0ec18c69f89abd0c9653d8953ce8d9
  1. .prebuilt_info/
  2. 7/
  3. current/
  4. go/