Merge "Use non encrypted pwd for AAF communication" into frankfurt