Merge "AOD: Fix WakeLock leak" into pi-dev