Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 2f9af2aa69  -s ours
am: 04f8ba7bb7  -s ours

Change-Id: I4f4317d788bff53bf621b06a6e01498f8497253a