Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727  -s ours
am: 337c1b1108  -s ours

* commit '337c1b110856328476341b405c31accacf6d48b2':

Change-Id: I826a96483a3120cb89337179c8438053992f7988