Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb6e5df633 -s ours am: d17ac6f18f -s ours
am: 7af6955dbb -s ours
* commit '7af6955dbbecb534d223044556237234bba72932':
Change-Id: I0aa582193c0daf7c0861f94431b0dffa40fb74c2
This commit is contained in: