Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 6654edae49  -s ours
am: 5e1652a7c9  -s ours

Change-Id: I12564fcecc14484b8cf32c669f77bf5f11c0fa87