Merge remote-tracking branch 'upstream/chromeos-4.4' into chromeos-4.4__release/core52-81

Change-Id: Ia8796f2023254408ddc432854be5768ca6d10a03