Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp
am: 70378c6da6

Change-Id: Ic9c4222de1ab6248a996d8f8e7e21c2f5a33d231