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

Change-Id: I85f851533bb020a3403f8bcc550b7df6261cca66