Merge "Trusty Keymaster@4.0"