Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e8dc857c2f  -s ours am: 28b2f5f023  -s ours
am: 710ceed9fe  -s ours

Change-Id: Ic5e4617930be9856deb466718e1549a2677907e8