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

Change-Id: Iba14cc0d0ef8dfb745b946d9504e261a6ab2f519