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

Change-Id: Iec4ce94d01d5f516541e795ee2eb740a495357f7