Merge "Import translations. DO NOT MERGE" into nyc-dev am: 97360f90ce -s ours
am: 7458bdbe4a -s ours
* commit '7458bdbe4a13030990cb175f88f436cbcdf620b8':
Change-Id: I0ffcd62fc1ecd60c66ad19755778dd5f86ba269f
This commit is contained in: