Merge "Hookup to cmdline parameters in emulator"