Merge commit 'ea85711f1bba755e55439f7d1471067167cc15b3' * commit 'ea85711f1bba755e55439f7d1471067167cc15b3': Remove unnused variable.