Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e  -s ours
am: f745ac7a08  -s ours

* commit 'f745ac7a084e278146b2a386baf4e30c8fdfb12e':
  Import translations. DO NOT MERGE

Change-Id: I6bb139fcd0dbafcaeab2cf70fb030f63089e41e2