Merge remote-tracking branch 'upstream/chromeos-5.4' into chromeos-5.4__release/core71-49