BUG=angle:520

Change-Id: I4e8191dd827744ef380348a31dce7181d99fbf30
Reviewed-on: https://chromium-review.googlesource.com/216645Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>