Merge "Fix partition configuration for auto builds" into master-cuttlefish-testing