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

Change-Id: I78fefb7537855d2054c44f6fc5f4505b5eb00027