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

Change-Id: Ic9eefceb410cce8f09b12d7918365426b98b94cd