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