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

Change-Id: I8328c9cfb2376ca35d668e03e672e5eb537b09c8