Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 81c6e4b4e0  -s ours
am: 493fa06f62  -s ours

Change-Id: Ib2662da2a687a45646fc6cc00056b6835353fecc