Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev