Bug: 851166

Change-Id: Icbd81a2dc22e274173ddf8f9cf79820c077f56ba
Reviewed-on: https://chromium-review.googlesource.com/c/1286765Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601770}