Changes made to prevent sending MAC_ID and ANDROID_ID