Merge "Import translations. DO NOT MERGE" into nyc-dev
am: aebe22dbc3 -s ours
* commit 'aebe22dbc3460b56dcd822199aabdc468ca227dc':
Import translations. DO NOT MERGE
Change-Id: Ib76288b42cadb1c0d83ef933e57b588753df821e
This commit is contained in: