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

Change-Id: I3abbf9f95fd0c6b9cb2bdce1b68aa748a4688634