CHROMIUM: Merge remote-tracking branch 'origin/master' into HEAD

BUG=b:156409233
TEST=Test cases in b:154892384 pass

Change-Id: I2904dee7ca5f95a2aed759e7bbd2339255874b5a