Merge "Don't hardcode the super partition name."
am: 02678f32be

Change-Id: Ice82e64716fbb56fa94f33f4f959cc1b2f95939a