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

Change-Id: I78c46d62288192b018d0f62d34ffaf6b6d4f1e8e