Revert "[1/2] Base: Custom carrier label"

This reverts commit 5440f5472b1548d7b181680973e831c250961391.
[1/2] Base: Custom carrier label

OmniGears: https://gerrit.omnirom.org/#/c/5221/

Change-Id: I3ade5d80f1ec0574d8e924fcb8ef5eb32957df8a