Merge "Committing the changes of Locate cred tags to Gerrit."