Merge "Added string token to CARD support multiple languages" into stage-aosp-master