Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb204b98d5  -s ours am: 4d875b8b49  -s ours
am: fb0e8ead91  -s ours

* commit 'fb0e8ead919f3aafddb78ae8a8c45b821b92fd24':

Change-Id: I616804d491f9bd8595248eb5574ce14e8ea7e8bb