Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: b9aa9b47e7  -s ours
am: c446ef54ae  -s ours

Change-Id: If7a2109f29f5b76bf1e40b4f92019a0dcd3613c6