Merge remote-tracking branch 'upstream/chromeos-4.4' into chromeos-4.4__release/core40-152

Change-Id: Ic45d79bd48927d3af8777097159dfe7402062677