Merge "Re-add return statement if ignoring failure in BusinessLogicPreparer"