Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 273bb516ad  -s ours
am: b10ffae3cb  -s ours

Change-Id: I32c733afa59e9ffc0116539a25600971f7fcecb9