Merge "Modifications for AAF identities"