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

Change-Id: I98bfb5020b27db6c3672f30fa0266c5397651a5e