Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0  -s ours
am: fca9f14523  -s ours

Change-Id: I93d33092855c51ea31bd376ea49e3a312bb88eac