Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2ebc085  -s ours
am: 3aa5844  -s ours

* commit '3aa5844bb1fdb238404ce13003784911bd3f9030':

Change-Id: I8763b5fa71ee503fd7a27f3c1e6751cada22f05e