Merge remote-tracking branch 'upstream/chromeos-4.14' into HEAD

Change-Id: Iacbd0103f3cc6949993581a24e0f44614bac2037
Signed-off-by: Johannes Berg <johannes.berg@intel.com>