Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: dadef6881d
am: f1b39a595b

Change-Id: Iac298f90fb01d02363c313da5cd9e48d04bcd895