Merge "Doze: Fix broken non-AoD"