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

Change-Id: Ieda3709213e7e1e3cf1d326663573238f2b11aed