Merge "Drive-by clean-up: remove redundant operation" into sc-dev