Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: f3db881c0c  -s ours

Change-Id: I86910f68247dbb886e7f3b4b646cf0d8fd8e686a