Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e5ae77c679  -s ours
am: 2ef5de5dda  -s ours

Change-Id: Iebd1a2a9787104ffa33a0aaf06157f89655959f9