Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 9421be2011  -s ours

Change-Id: Id624f18f91ebf282cf8a5498f0c0b4c6682ea89e