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

Change-Id: Ib76401153542cbc7ee673d2644cf7914d5b55e67