Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9  -s ours
am: fb80235f41  -s ours

Change-Id: Ia65005887ed720a1d90fe93f5bc86a285c38df0c