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

Change-Id: I590075e7459a377d23cab4b44b1fb81e87184074