Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 5bb180388a  -s ours
am: 1072cc1175  -s ours

Change-Id: I63a62b20953668ba82cf05387041cfa8b1d2e0bb