Merge "Add support for products overriding properties in /default.prop"