Merge "fixing a bug for aaf authentication"