Merge "Fix wrong import for INtnSignalStrangthConsumer" into main