Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 60c9a61b93  -s ours

Change-Id: I30450a479132eaa9c220f87270fdf16908256c24