Merge "Import translations. DO NOT MERGE" into nyc-dev am: aebe22dbc3  -s ours am: a0ccbadb8e  -s ours
am: 20aca40d03  -s ours

* commit '20aca40d03a75cb04f32e16ec379a41b2a72b27a':

Change-Id: I1dc3f8005c382141bdc0537c6e2ad7cafe66237d