Bug: 
Change-Id: Ibd094c5f0fddba4932d3b87f4c27d6af4636217b
Reviewed-on: https://chromium-review.googlesource.com/847374Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Pierre Langlois <pierre.langlois@arm.com>
Cr-Commit-Position: refs/heads/master@{#50329}