BUG=875541,875542

Change-Id: Ifbf0803605b049a1639a4a609c5fc668c8257658
Reviewed-on: https://chromium-review.googlesource.com/1205791
Commit-Queue: Theresa <twellington@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589006}