Merge "Add back protected profile availibility broadcasts." into nyc-dev