Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5a45cf7  -s ours am: 892ba38  -s ours
am: 2f60461  -s ours

* commit '2f604615057379a670afbf1fc458efd59e54ee6f':

Change-Id: I7ceeca81d82483212f3687df25c823347bc4ac81