Merge cherrypicks of ['googleplex-android-review.googlesource.com/25815993', 'googleplex-android-review.googlesource.com/25815448'] into sparse-11282838-L21100030001153269.
SPARSE_CHANGE: Iab23d39013cec8644303c48cd093cb23359e1798
SPARSE_CHANGE: Ia93b3dc3d43f046dfb13c9422d2b28fe49c9b8b6

Change-Id: If2339e1784d025902ec2ebd8d4f7c5980180846a
tree: 07804a034c8d27b64c025943f83e47dc23c6b218
  1. .prebuilt_info/
  2. 7/
  3. current/
  4. go/