Merge branch 'cros/chromeos-5.4' into 'cros/chromeos-5.4-manatee'

BUG=None
TEST=run upgraded kernel, uname -r: 5.4.91-manatee

Change-Id: I8c1006a53313a3b266e6ade9230da2cfa23e1efd
Signed-off-by: Tomasz Jeznach <tjeznach@chromium.org>