This change fix all `consistent-return` in ESLint. Change-Id: I8a5db7205da58f9626ca5e5c060ed2a51d700852