Variables are no longer defined locally

Change-Id: Ic7cfe7f156fd8c13abe99c661c250bfc9139c3e5