Merge "Change how Advertise Data is passed to BTIF (3/3)"