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

Change-Id: I9ba3b08df0ac649e0fe3afcabee25c88b0df3620