Merge "Support multiple partition for /data" into main