Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 97245699 -s ours am: 18b818e2 -s ours am: 415ca774 -s ours Change-Id: I0427d5fcc7a93893de057175286ea44853a59ede