Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 8c9d0dbeda  -s ours
am: 5abcce865e  -s ours

Change-Id: If70b60d90262aa98775d2ba6929c48a2de70cf51