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

Change-Id: I4e682aa58b0d889c9ede17b2b695cb9ec07b4b80