Merge "Import translations. DO NOT MERGE" into nyc-dev am: 917ead578b -s ours am: d2e1791807 -s ours
am: 6ffd2b2829 -s ours
* commit '6ffd2b28292fce8adf925ab35b9533dc35fa50df':
Change-Id: I15c09770df170e9b888042cfea7464082b9683d2
This commit is contained in: