Merge "Support /odm partition" am: 97debc7055
am: 6b31653f96

Change-Id: I75b3ffadcd2cec233438c183258c2ad5782b61d4