Merge "Update the broadcasts reserved to the system" into lmp-dev