This rolls a few changes from upstream noticed by early testing.

Bug: 900461
Change-Id: Iea568be41e3149a667fba655576bdd591b353079
Reviewed-on: https://chromium-review.googlesource.com/c/1387706Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>