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

Change-Id: Iaaf4c696269279b5ad3c2489a636450ead02f475