Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 662f6b3adf am: ec2df78ad5
am: 7cb8f3dc8d

Change-Id: Iafbb9db2a8474b33b205d6e3374d5ee8180db63c