Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384  -s ours am: cccb304acf  -s ours
am: 8437c2d1f2  -s ours

Change-Id: I1d941d3545f3e390ba5475ab3b77e59a37208d74