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

Change-Id: I933124850d22a94d020b2898459393e9bd1e0e72