Merge "Import translations. DO NOT MERGE" into oc-dev am: 69fe3e4678  -s ours
am: d1be7b6f73  -s ours

Change-Id: I46c440c37117bcaae7722355aee5e128472923d3