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

Change-Id: I12a3340aaa49277aba78c7dcc51b063458113262