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

Change-Id: I3097ca33424359cfecb99140d5b576dfec925b3e