Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev