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