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

Change-Id: I41b4c9f12a8ac9eb459c03d6890a23bfaafe473f