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

* commit 'b0a836ba942dd2bcbfdcbe539b69d31fb0af98bd':

Change-Id: Ie12f885e287370161bca2ef11d7afd72bc49f00b