Merge "Remove eslint-disable no-use-before-define"