Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am: af5acad9f1 am: d378db0b2e
am: 6558544a75

Change-Id: I11a1c8daf0355674ea0d9d4d15c6ee95a18e9cf4