Merge "Wakeup packet mark/mask configuration option" am: b975c88178 am: 01860f8ea5
am: 48360082bc

Change-Id: Ie5c88f5b91248a5f069decc0708f17af4b649710