Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c3acddbb75  -s ours am: f68f600ca8  -s ours" into nyc-mr1-dev-plus-aosp
am: 5957015594  -s ours

Change-Id: I996e4aa00423f72609892c111c417910a99da1ca