Match cm's spn-conf

Change-Id: Ia6f2704293f2c3ed933eb925829eb2b5dfd6c6f2