Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 0a4315194d  -s ours
am: 4f174386a6  -s ours

Change-Id: Ic9cc01995a828f9ac8d92cdb236a2312659a2306