Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 7220f64f71  -s ours

Change-Id: Ife1480227f84f43ac43f4d5f2011822d56a60bb3