Merge "AOD: Remove wake up fully config flag" into oc-dev