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

Change-Id: I2bfd112f3d8f663dc9a870a961460c36fe9f7ea4