Merge "identity: Use "credstore" for LOG_TAG everywhere."