MFC r360288: Put advertising data in correct place.
Submitted by: Marc Veldman <marc@bumblingdork.com> PR: 245848 Sponsored by: Mellanox Technologies