Merge "Merge "Add support for starting external Sessions" am: 4ce60695 am: 9bec1a50 am: 2504343f am: 74cd51fe"