Merge "Keymaster support: Verbose vendor errors"