Updated CM defconfigs

Change-Id: Ic9a266392a075bbc9f7816398d11f62eda8535d2