Revert "Revert "case 2: merging settings from CM is no longer a good idea""

This reverts commit 6f14073bc3920e5def19b145df564169d7d2de7a.

Change-Id: Iaa0234acaeb23d14aba921ab8a0e3e634f1a58d5
Merge "Revert "Revert "case 2: merging settings from CM is no longer a good idea""" into kk44