Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781
-s ours
am: f12e2ee361
-s ours
* commit 'f12e2ee361e4973a858d6b0e31c9b3c7a54045ed':
Change-Id: I3c809004b464b7532610850aeae2299271672e4a
This commit is contained in: