Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev