Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d4177b8610  -s ours
am: 53c71a90fb  -s ours

Change-Id: Ibc881b5f7161b876de104aece3ffdb133389b0e2