Merge "Import translations. DO NOT MERGE" into nyc-dev am: f3d2c06146  -s ours am: 90c64f02f2  -s ours
am: 7ca38bd8e7  -s ours

* commit '7ca38bd8e798e0d6417eaebff76d219827b6e82d':

Change-Id: Iec7b44924b69f2131d67c5e3834b8cd6f3727a68