Revert^2 "Remove unused emulator variable"
am: a697b47770

Change-Id: I8b636b5929a8de84421347fe5027c42b0a7cd694