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

Change-Id: I26ce216345d4e820038dabd413a0bbcb787c3a9e