Merge "Import translations. DO NOT MERGE" into nyc-dev am: aebe22dbc3  -s ours
am: a0ccbadb8e  -s ours

* commit 'a0ccbadb8e91a0f85a70b32f5fbca2780af8151a':

Change-Id: I59eca363ff6396fc7b8c64acaeac20647d39b8f1