Merge remote-tracking branch 'upstream/chromeos-5.4' into chromeos-5.4__release/core52-142

Change-Id: I5fa9bf1244ce7be3a30907ecdfcf9ba48f76ecf4