Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4a19326  -s ours am: 61f3f25  -s ours
am: 3fd8985  -s ours

* commit '3fd8985ae28b44733e6873a98178ebdfde6f9bdf':

Change-Id: Icac3bb7c7c523e0ed9dee674b6b89a83769bcd5c