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

Change-Id: I741bb39249d8b366ba119c595081c4bce26cdcc2