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

Change-Id: Ib5c0b31b883a04765a59c1068c6b863ee3afdb84