Merge remote-tracking branch 'origin/master' into feature-cc-psa-crypto-drivers

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I13aa534658bd3ab422b8d8f1d09696fb00d78349