Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 9af0c89 -s ours
* commit '9af0c89da7166048a1e38ea4c65a7ecb788ea94c':
Import translations. DO NOT MERGE
Change-Id: I2b076c29cb2ca395a9067745865229bb3bf00f65
This commit is contained in: