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

Change-Id: Id833aca9d46f3d40b291b981e1441dfc03785629