Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c  -s ours am: d5d030af8b  -s ours
am: 3008905af3  -s ours

* commit '3008905af3e4d5e7d7827014031a50188049638b':

Change-Id: I2c8651d3c53f925947d73785385e49ba0fe5693d