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

Change-Id: Idb3a2c8387b8faac48c0d63d1f6c2fa84b1fb73e