Merge "Import translations. DO NOT MERGE" into nyc-dev am: b731377822  -s ours
am: cd0838076d  -s ours

* commit 'cd0838076de3bd09140f2b79456aa4e7f1467f09':

Change-Id: Ibbb06b8654cbb2965e0a56db622e1f9f571f1ccd