Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3d9d9fa0d9 -s ours
* commit '3d9d9fa0d97974fc2dbd65ed1bd5b0995b3c347a':
Import translations. DO NOT MERGE
Change-Id: Ib91f10802f60fc4f7ee9cbe6f1d3df11b46ad37e
This commit is contained in: