Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 50fd9a9ca4  -s ours
am: f536f4989d  -s ours

Change-Id: I5331f5f50b3901b601ab0de53cf0d4c0b4166d96