BUG=316738
TEST=tested on device

Review-Url: https://codereview.chromium.org/2442033002
Cr-Commit-Position: refs/heads/master@{#427162}