Minor change to use matching type in comparison. Change-Id: I670cae2d584918c67c1af791a797629f392f599e