Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 2e354740de -s ours
* commit '2e354740de0664a45cefbdc2fd9f2a76090ed9ff':
Import translations. DO NOT MERGE
Change-Id: Ife4bb5babb193debdf7b9284f91e18d4818956a8
This commit is contained in: