Merge "Fix: Add check in floor1_info_unpack" into mainline-prod