Merge "Fix NPE in AmbientContextManagerService."