Merge "AodPolicy: Fix service leak" into pi-dev