Merge "Remove unsused variable" into stable-3.2