am 601d126b: (-s ours) am 84e66f54: DO NOT MERGE Remove default settings during contacts aggregation.

* commit '601d126bdb0e7a85739e3875bc4a0acfcbe874eb':
  DO NOT MERGE Remove default settings during contacts aggregation.