Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2130b28754 -s ours
am: a547d62f78 -s ours
* commit 'a547d62f787fc19f11447aebbb39bb3a109b9acd':
Change-Id: I3b9530bc3afbbe5a45ac406214534c7b7fe2f1a7
This commit is contained in: