Merge "Import translations. DO NOT MERGE am: ba35e1f170  -s ours am: 0a9cb7a9d0  -s ours" into nyc-mr1-dev-plus-aosp