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