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

Change-Id: I2069e117832d43179a3190090467e75a5f5f3c4c