Merge "Import translations. DO NOT MERGE" into nyc-dev am: 072150db89 -s ours am: 998797a27d -s ours
am: 80cf9ecd58 -s ours
* commit '80cf9ecd584e832f41bb37890e13c25870f649a2':
Import translations. DO NOT MERGE
Change-Id: I7eb685e078cddd1e418a69be4d991221ef027c4a
This commit is contained in: