Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: decbebd3d5  -s ours am: 75f0aab3b5  -s ours
am: f9187127f2  -s ours

Change-Id: I0362d7dab794f22a1849a5c515f456b3a46dff24