Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bf2eaa1029  -s ours
am: 2be91e7aff  -s ours

Change-Id: Icab5326419697a45d9338f0dbc57aa24eb3ac99a