Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
@relan: Tested on device, upgraded from 2.6.3. Found no problems.