Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 917ead578b -s ours
* commit '917ead578baa6fba7e8e45756c67c879bb912364':
Import translations. DO NOT MERGE
Change-Id: I5359b0ee4ae342ed910fa7b888f1dcd621c4fd35
This commit is contained in: