Merge "Update the code to read aaf generated passwords"