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

Change-Id: If91818c92885e29dcc6f177240b280c92a1359f6