Merge “overlay-cdma” into “ overlay”