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

Change-Id: Ie868e30032e9dc633bd2205413704d30801fd815