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

Change-Id: I5ea38f0c7f2ab572ba5adaa6df161136bf782e0d