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

Change-Id: I66bb489be3c3fd3d0c82478a14422dc9454711ab