Merge "Use shell permisisons before checking service state"