Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c3d842df73  -s ours
am: 2ad224ece6  -s ours

Change-Id: I9c779248876392fa33a01aa023deef89b7ac2ff0