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

Change-Id: Ibfc11d3ad1c6a5892ada761cab957f65467e511c