Merge "Simplify how image partition parameters are generated." into studio-1.4-dev