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

Change-Id: Id5ee8473086b2a1644cf81d2e932677d6052c2df