Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220  -s ours am: 46181531ec  -s ours
am: 133d4881ef  -s ours

Change-Id: I0bd053896b033b22691f76b7edfcf42a000b38b8