Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk am: dd74c249b6 am: 0ecdddafa2 Change-Id: I453f0d0b6c5e2514617d84d5671deb32dc56222e