Merge "Import translations. DO NOT MERGE am: f84cb88da4  -s ours am: 239c749557  -s ours am: 9e0d42cc3e  -s ours" into nyc-mr2-dev-plus-aosp