Merge "Fix dump: dump mSpnOverride value"