Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: e2d9a7fef5  -s ours
am: 0b708f9f84  -s ours

Change-Id: I38e8bddff0ec7a630e646512818f417d75b57e62