Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f  -s ours am: 6c4a3962e7  -s ours
am: f21ed271f6  -s ours

* commit 'f21ed271f60183c55290b6a82d1ad60a8ed6228c':

Change-Id: I19ff40313b8b5eef2df298ae41acc71def6e6972