Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f3db881c0c  -s ours
am: b02ba73c7d  -s ours

Change-Id: Id437d7da4c74788afe857ea09ae9974cf77c8132