Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d97f049315  -s ours am: a4fc5f2b76  -s ours
am: 5798a13b5e  -s ours

Change-Id: I8f53e8edfc54644ca7f79e2c2851d4092a027f86