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

Change-Id: I70f15fc4332019f5bdfb21a7f092be8c968b438e