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

Change-Id: I4d08dad81f04f32211a4d29df13bcaba8c63a4f8