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

Change-Id: I5c878620d97c3c6e90b3579e1102f56e14a8c6eb