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

Change-Id: I7b95d63ad8586b62b910af248ce04f2d17816802