Merge "Import translations. DO NOT MERGE" into nyc-dev am: 41a1d11f98 -s ours am: cdd880f96c -s ours
am: d02f0e4b96 -s ours
* commit 'd02f0e4b96e1907cf11761cf2a993943c4cc7f71':
Change-Id: Iafcd767ef11dbc3c2d4d6347eeaeb8db0f0d37a5
This commit is contained in: