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

Change-Id: I9055e8b99523a930a3495d252e37ab23813b5e24