Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 994ec6a0ec  -s ours am: b1056852a5  -s ours
am: d343a87b10  -s ours

Change-Id: Ibce5ef78caea52616175afac35d0fdd828de2265