Merge "Import translations. DO NOT MERGE am: 8f05e63417  -s ours am: 7a45aa2cff  -s ours" into nyc-mr1-dev-plus-aosp