Merge "Support /odm partition"