Custom carrier label (2/2)

Change-Id: Ie14680abc2b2056bdc8a5d160a216bf969efe022
Wake On Plug (2/2)

Change-Id: I8078d84e2d86892546371c2852b741af8e7ecbf2