R=jacob.bramley@arm.com

Review URL: https://codereview.chromium.org/1244023002

Cr-Commit-Position: refs/heads/master@{#29774}