Merge "Support /odm partition" into pi-dev