Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8437fce56d  -s ours am: 31cde3cd69  -s ours
am: efd96481c3  -s ours

Change-Id: I5073fed1e98a12b4d9e432516f354a9a76056b37