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

Change-Id: I7e724759d23cd58982b981437cb84ae66d9355c4