Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: dfb24a204f  -s ours
am: 74d10c0b14  -s ours

Change-Id: Ie3500be37250170ac803e80de5cfaf2976967e22