Merge "Merge "Add function to change LE Tx Data Length" am: 383a7d432f am: cffe307fa5 am: 3a19b325c1"