Merge "Import translations. DO NOT MERGE" into nyc-dev am: 451dc7e  -s ours am: 7527dee  -s ours
am: 47b9ce5  -s ours

* commit '47b9ce5c7bf8fa02960e83a937b5017a04b30beb':
  Import translations. DO NOT MERGE

Change-Id: I7fd6b4cab9797411b23d856c97e123eedbe6e486