Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 96701d3c94  -s ours
am: 443276fcf3  -s ours

Change-Id: I65ca05a47129b8673577ddebb67dd4910807440c