Merge "Fix bugs with Remote Connection Services." into qt-dev am: 7fceb2018e
am: 1e6be5b450

Change-Id: I721c1a4328ad6bcd516a79efed88916aeff3ab34