Squashed commits of sweep2wake

Thanks to @showp and @faux123

Change-Id: Ib9ac4ae3c11db1900508b8ac6ae88c98a9901afd