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

Change-Id: I93d1e66cc995a91f51bca4bb2aaf42554170a527