Merge remote-tracking branch 'upstream/chromeos-4.4' into core35-for-chromeos-4.4

Change-Id: I42782080978cafe2decec32296b0b7c188c06d57