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

Change-Id: I1132a94369c09f75e1f961ffe9ee90a71996c013