Merge branch 'merge-mist-rewrite' into merge-mist

BUG=chromium:370275

Change-Id: I7df4427b6baa17e58e93db00f599066f5ee7fda1