Revert "Remove unused emulator variable" am: be416b3155 am: 82959585a8

Change-Id: I632dd401b17ed7c332fbf3f1cbe9830280ffc318