Merge remote-tracking branch 'upstream/chromeos-6.6' into chromeos-6.6__release/core89-60
Change-Id: I6771c8270306684233f36daad35012b1b71f7249

Change-Id: I162d879770e4974492540f7f3610d85f2b5258fa