(bug 45591) Fix inconsistent function return type

Change-Id: Iccc4acb2bb809d0f957d73d6e8a4da3033839c1e