Merge "WakeupController: remove --nflog-range" am: bcb80941dc
am: 42d8321638

Change-Id: I0ab13d0252282419c6ae865b4d9b4544d1779fed