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

Change-Id: I8c6cefce67defe96a9cc97a0f05aaa60ba950093