Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 18fb169068  -s ours
am: 444ea9c751  -s ours

Change-Id: I301d1d7f8b56d491eb57c2bdd4db0e1acd80f628