Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 178e861e6e  -s ours
am: eeb9fba09d  -s ours

Change-Id: I0724912d370c2b7d157440d029673d0525b5b292