Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk
am: 27fa02b096

Change-Id: Ie8e9c5b371d7bb1bc28f1a23502fc5bf27a85442