Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903  -s ours
am: 18b818e2dd  -s ours

Change-Id: Ia30698cfb205b69d5d954ec4f9405fa228aa572e