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

Change-Id: I37632f490c0ac8e74ab9f6a5e198740397e753cd