Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ba25767 -s ours
* commit 'ba25767b1b25bb7dac9c6753959bf3b4bcd877d3':
Import translations. DO NOT MERGE
Change-Id: I2b9864f74f86b858b8d99d49aecbbc4f0ba60ab2
This commit is contained in: