Merge "Log preference change as Integer instead of Long." into oc-mr1-dev