Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4233404ee4 -s ours
am: b53c4e68ec -s ours
* commit 'b53c4e68ece0086c9089a29051a32b7ec260efeb':
Import translations. DO NOT MERGE
Change-Id: I4d4eb4dd2ff30b16886b4c83330921b3b1ea1495
This commit is contained in: