Merge branch 'merge-cromo-rewrite' into merge-cromo

BUG=chromium:370267

Change-Id: I090189be488624a3a6bcb4b85e119bdbdda5d998
tree: 50136329ead3f18165ec39b29ec974fe2d633f3a
  1. buffet/