TBR=machenbach@chromium.org

No-Try: true
Bug: chromium:748036, chromium:748038, chromium:748124
Change-Id: I0102446623110a67655c4d119968c64afd879280
Reviewed-on: https://chromium-review.googlesource.com/805235
Commit-Queue: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49815}