Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2 -s ours am: 5c2575071e -s ours
am: 1400ea56b0 -s ours
* commit '1400ea56b0d935803df6f10193114c37bd4a3dcb':
Import translations. DO NOT MERGE
Change-Id: I6a05713c87dc9b8b87891d99f126705aaa69c31e
This commit is contained in: