Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188
-s ours
am: b925300049
-s ours
* commit 'b925300049818ece4f0ace2adda4c1d425ccef56':
Change-Id: I2e9fdce3c21114ba3e47d53e8cf8d50b484f384a
This commit is contained in: