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

Change-Id: I6455cf380a5c700861b677860347e00342f5c807