Merge "Import translations. DO NOT MERGE" into oc-dev am: 44141092 -s ours am: 46181531 -s ours am: 133d4881 -s ours Change-Id: I0bd053896b033b22691f76b7edfcf42a000b38b8