Merge "Renaming string constants for intent action in tests"