Merge "Change to AAF-compatible default credentials"