Merge "DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation" into lmp-preview-dev