fix partition switching in 2.6

Change-Id: Id46f11b475f6b807361edd676e85005030180404