Fix quoting. Fix unused variable. Fix variable naming. Change-Id: I9c4286a5f46d60247e3a31eabc513c8da7fb35bd