Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk am: 27fa02b096
am: a8fa7d906e

Change-Id: Ib05ce71eb9287993320285c1cac90315dd627ec5