Merge "Change ENABLE_KSM to $ENABLE_KSM"