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

Change-Id: Id6e530980e21ac4d2cb63ca3623bc28457ae8c2d