defconfig: From CM d2: commonize everything commit