Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c95d9b29e2  -s ours
am: 6331bfd209  -s ours

Change-Id: I23147707ca5e2349d9a86a1e8042d14b1495ec9d