Allow multiple return statements (#13809)

Change-Id: I65af78b4713a8e4983657bf8614bb46cb9bf9933