Merge "Bug 4733 - impl/SecurityServicesImpl.java: null pointer exception"