Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours" into nyc-mr2-dev
am: d37981be5a  -s ours

Change-Id: I847bb6ba0d87353748f4506502f5d17d0f93d035