Merge "Import translations. DO NOT MERGE" into oc-dev am: 5228e5d0cb  -s ours
am: fb5fdf1012  -s ours

Change-Id: Ib99c9f8b11e9cb0c2b8c8502e24b2f80ff23686c