Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: b0b67347b3  -s ours
am: 7471d2cea2  -s ours

Change-Id: I51e9f2320937017c5496b1aa0c5d55545b6aefc0