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

Change-Id: I782614166a75a36f637de928b66d527b68413e69