Replace multiple 'if (x) return;' statements with single conditional

Change-Id: I9487687586ca4694fd0bca87a13b813e5d1ff188
2 files changed