Merge "Added null checks for NPE on mSystemServerInterface"