Change partition handling

BUG: 64811705
Change-Id: I9e2f6e5fc26e5a229f1d1d81a2a49f27768c482d
(cherry picked from commit 399777da981455938a3aff3c2d71135c3094267a)
2 files changed