Bug: 
Change-Id: I41ce841cd20bab26de29437d4365f011c98ad53e
Reviewed-on: https://chromium-review.googlesource.com/739392Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Commit-Queue: Georgia Kouveli <georgia.kouveli@arm.com>
Cr-Commit-Position: refs/heads/master@{#49006}