LPS-40704 ServiceContext has a default empty map for expando, do not set to null if not necessary, to avoid NPEs in subsequent calls