Merge "Import translations. DO NOT MERGE" into oc-dev am: 05c71b3bbe  -s ours
am: 2d8e49dace  -s ours

Change-Id: Iec97570d815d27c79482d29b5612fa71edcb44fe