Merge "@hide ConnectionService APIs." into lmp-dev