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

Change-Id: I0fb9f9ac5a99e4ece8feb118f7540770b8580e69