Experimental: Update changes for wakelock changes