Merge "Expose ConnectionService Handler to remove flaky tests" am: c9a0702a am: b56b8ea6 am: ad47db78 am: 1066fe86 Change-Id: Idd1f345355592824cf40d790ec267180aa2470ab