Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: e6e616d3cd  -s ours
am: 7df8046f1b  -s ours

Change-Id: I77c1b070a76d3c1ff537dd410bd72631cca297f6