R=machenbach@chromium.org

Bug: chromium:748002, chromium:773606, chromium:748003, chromium:748035
No-Try: true
Change-Id: I80ec2a4bf8cb1193c4f31ae1dc84e7f88a2011b4
Reviewed-on: https://chromium-review.googlesource.com/779431
Commit-Queue: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49522}