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

Change-Id: Iaa01e6057a78003aa25a1b7142b2cc843b49716a