Fix quoting. Fix unused variable. Fix variable naming. Change-Id: I9c4286a5f46d60247e3a31eabc513c8da7fb35bd (cherry picked from commit 8d1cfbda7d) (cherry picked from commit 63258701f7)
8d1cfbda7d
63258701f7