Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours am: ed0e749092 -s ours
am: d785db718c -s ours
* commit 'd785db718c4adf21ba36e8d2ca6e1c60047e3d55':
Change-Id: I595fbf6c7c46b83c144954ca422c384361b4b53f
This commit is contained in: