LPS-44802 Made Service Layer's behaviour consistent with upgrade process