Merge "Fix Mega_device build"