Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 4001aeb858  -s ours

Change-Id: I77a1073dd366e3994cfb90d07150e2f20534cf94
tree: a398d5157488ca0684620a8b8dcd15e96545065e
  1. res-common/
  2. src/
  3. tests/