Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2  -s ours
am: ed0e749092  -s ours

* commit 'ed0e749092e8d8303876738b159278c8f226fc55':

Change-Id: I71989db7e276e5e4f735725fbb250d6aea764b56