Merge "Expose ConnectionService Handler to remove flaky tests" am: c9a0702a26 am: b56b8ea65d am: ad47db788d
am: 1066fe8632

Change-Id: Idd1f345355592824cf40d790ec267180aa2470ab