Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: ec47322af8  -s ours
am: e1b47c56a7  -s ours

Change-Id: I892f8ab81f450e84c0e615d0a3471590afec8678