Merge "Merge "Don't populate a setting instead of defaulting to 0 when not set." into oc-dev am: cfeb3228 am: b0d3b3a5"