Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours am: 86ce04b6e0  -s ours am: 10d2fa1ab5  -s ours
am: c32f5a7828  -s ours

Change-Id: Icba6165b4f29f4945b17b9dc694ddff877054555