Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b450382267
am: 67835669c3

Change-Id: I13fa9c4a3b8bd4e2a496f5eee86f16801798cbce