Merge "More Fixes for CtsScopedStorageHostTest" into rvc-qpr-dev