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

Change-Id: I815b7a16c8893727641bc724b06feccbb6ba30ad