Fix undefined variable

Change-Id: Ie51ad6eaa78c19497f0c18e061064dfa52cb2025
Merge "Fix undefined variable"