Merge "Remove package level intent forwarding." into lmp-dev