Wake On Plug (2/2)

Change-Id: I8078d84e2d86892546371c2852b741af8e7ecbf2