Merge "[Smart Forwarding] Enable package/class entry in PARIS"