Merge "Fixing Readback Test failures related to auto-succeed"