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

Change-Id: I7295e4bb27e863dd144d1f79068f9e00a249368e