Merge "Merge "Add support for starting external Sessions" am: 4ce60695f9 am: 9bec1a5095 am: 2504343fcd am: 74cd51fef8"