Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev