Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01abe42307  -s ours am: e53a8b4de9  -s ours
am: 04aadfe816  -s ours

Change-Id: I10decca61eaee097aebc5654cc819c824c352b5f