Merge "Add connection serivce focus api interface" am: 2f37060ee0 am: ed673edbf0
am: 40e2b37105  -s ours

Change-Id: Ia896874afcf725ffee4fed0b70028f20d493463a