Merge "Fix for Gnss Hal for replay"