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

Change-Id: I7f0781cb71e8c9382e0085a7070a0c5aa00ae647