Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours am: 86ce04b6e0  -s ours
am: 10d2fa1ab5  -s ours

Change-Id: I8a7a1997f180dbb00f1d73bac7697419d5de3f4d