Merge "Allow PRODUCT_PROPERTY_OVERRIDES to override default locale."