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

Change-Id: I98f8eb4bd3a81e1d48b82c925dbf5cf5ac562de4