Merge "Fix bit flag for device id in attribution source builder" into main