Merge "KeySetManagerService: prevent NPE"