7143612: improve backwards compatibility of OSIS post-CR6887286

Reviewed-by: flar, prr
1 file changed