Merge "Support product partition for non-treblized devices"