am cb4d3ec1: Merge "Fix preference puts with "null" values."

* commit 'cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f':
  Fix preference puts with "null" values.