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

Change-Id: I4276a9512d94592723288a04e9b4fcf0b2488662