Merge "CHROMIUM: Merge 'v5.4.196' into chromeos-5.4" into chromeos-5.4