Merge "Import translations. DO NOT MERGE" into nyc-dev am: fe279b5016  -s ours am: b0a836ba94  -s ours
am: a05624f5e8  -s ours

* commit 'a05624f5e8a39b2b2c86d88f22c6e075f4abb54d':

Change-Id: Ie928e7c71c09022de14b2ab6b6242169fe4d3e18