Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b89f554257
am: 323569bcbb

Change-Id: I3e0f9a664e2409ac731d84ea4fea2f08b688d472