Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b14995516a  -s ours
am: 9fbeb40fc9  -s ours

Change-Id: If318447c1a74e2bf80522b2e866e4bf3b7c7c667