Changes to BAP session storage

[SEERM #7294]
[Bug #40937817]