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

Change-Id: Iaf23e334e60e6b3d35e7e5962cba6e113d860cc0