Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2cc7d2962b  -s ours
am: 7e28a0f130  -s ours

Change-Id: I25a4bf576c1c231e1d6ccc258bc93123bda766db