Bug 18300: [QA Follow-up] Fix return value inconsistency