Merge "Import translations. DO NOT MERGE" into nyc-dev am: a4bfd03cd5 -s ours am: 03797f0562 -s ours
am: 2696e0ad1f -s ours
* commit '2696e0ad1ff59e9a21488db8a8faeda215861c50':
Import translations. DO NOT MERGE
Change-Id: I8db21ffee5f9e01f2a41cc10b00099b7db3a8f0c
This commit is contained in: