Merge "Fix misplaced return in RescueParty" into qt-dev am: a47236b5b6
am: 3a4b805d7e

Change-Id: Iaef6baa943cd8a7ee9aceb92f52a340cf834234c