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

Change-Id: I7933d10917f0017fbb1d3f80a56eab35866398dc