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

Change-Id: I1d34072cf451c80f414b9cc06a5af4d391c5220f