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

Change-Id: Ib833f99b578d48c53ce481fc098e694cf8acc76d