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

Change-Id: Ibf25f1055624c76de6dd921261418582d5cbda73