Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours am: 83a6b9dc61  -s ours
am: de705ff417  -s ours

Change-Id: Ibb12229ced65c4e5cdb11a795cf097293d589e31