Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6e5a4b9384  -s ours am: a3a808ff47  -s ours
am: 82f8760dce  -s ours

Change-Id: Id2d59943f309882df76097ad893a4710fee4d3d5