Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 5b67a302d4  -s ours

Change-Id: Ieab93fb1ab78ad5633e328eee9c59616239ea487