Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b26e27dc4a  -s ours
am: f6e16b8604  -s ours

Change-Id: Idc09dc274841228ccce97d9613438df2fa210ec7