R=petermarshall@chromium.org

Change-Id: I6901ddcd1ca1fda474e8d2766fbfc60d2f5a9bec
Reviewed-on: https://chromium-review.googlesource.com/763628Reviewed-by: Peter Marshall <petermarshall@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49298}