Merge "Update storaged CTS test"