Merge remote-tracking branch 'upstream/chromeos-4.4' into chromeos-4.4__release/core58-45

Change-Id: I4b00627d826824b1e7bc6159269f2d530e7ba7bb