Tested with Firefox build, upstream bug:
https://bugzilla.mozilla.org/show_bug.cgi?id=1471632

Change-Id: I4b44847dfc69ee26cf2215b0a0b7573becfd369d
Reviewed-on: https://chromium-review.googlesource.com/1117187
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>