Merge "Support /odm partition" into pi-dev
am: 6665d991e1  -s ours

Change-Id: Ie8ae363b59831187043d46b3393e40f455e0374a