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

Change-Id: Ifda84719fb488b46456723973b76ce59caef0aa6