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

Change-Id: I3b4ad7bc8c424e58daddb1d5f16d338f35636eb6